Clean up comments and tidy up a bit.