Fix whitespace/formatting