year refactoring