refactoring, prep for year