Comments, cleaning up code, pretty output
Cleaning up