refactor year