Fierce whitespace clean up (yes, it was needed)