Fix whitespace issues to meet code standard