Tidy up manual a bit