small refactoring, going home for the day, refactor tomorrow