Start of general whitespace cleanup