Updated Format Year and Format Month Methods