fix whitespace and formatting