formatting and whitespace cleanup to match the rest of the file.