WHITESPACE
Style cleanups