Fix whitespace issues in source