year output more DRY
minor refactoring