Whitespace

Fixed ALL THE WHITESPACE (hopefully)
Whitespace + Refactor