renamed retirments to retirement and some other small cleanup