Clean up

Minor clean up. Removes a few comments, and reformats a few others.