beautification, mainly just whitespace fixes and simplifications

my precious alignments ;(