whitespace refactor