[3000] Whitespace cleanup