Get more optimized
Refine method cohesion
Add spec for year