Code cleanup, relative dates for saying +2 years