fixes some whitespacing, one-lines some extraneous if statements, format...

...s whitespaces to be vim-compliant :)

Sorry that this literally replaces everything, it wouldn't run for some reason from the command line due to 'whitespacing' errors or something like that