Refactor year, month, day helpers