Additional whitespace cleanup