- more whitespace refactor