Removed <g> at end of year + code simplification