whitespace and formatting cleanup