whitespace / cleanup