new year refactor