Skip comments and fix module indentation

This contains #74 because I wasn't paying attention when I created the branch.