Whitespace clean-up