stylistic cleanup

just lots of little minor things, some \n additions may be subjective