Fix whitespace/code formatting