last useful refactoring, moving on