refactor year model