Tidy up.
Improve output.