whitespace/formatting cleanup