Fix whitespace and formatting