Refactoring and reference year fix