whitespace and formatting fixes