25 - more refactoring of retirement calculations