removed refactor todo and superflous whitespace