Nicer formatting for the manual
Neaten up the code