Remove a lot of excess whitespace
Major structure refactor