Extract special case checks
Rename year helper