Whitespace fixes

Rules:

1. Two spaces when not in a class.
2. One space when in a class.