Update year
Refactoring