Skip comments and fix module indentation

This contains #74 (which means it will still fix #72) because I wasn't paying attention when I created the branch.