Core Whitespace cleanup