(Whitespace) cleanup