Refactor FindYears a little