whitespace and {} cleanup