Clean up comments, some formatting