cleanup + added years