Now doing whitespace cleanup