Fix whitespace issues and other mistakes.