General whitespace cleanup