Cleanup comments, etc.
goformat