Huge whitespace cleanup.
I imagine the cost of doing this outweighs the benefits but it was driving me crazy.

Also, cleanup the window creation.