Several whitespace fixes, code looking much cleaner