Clean up weeknum_year function