cleaned up formatting

Are you happy now? Also a couple of minor changes. Curse you forever, github editor.