Improve calculation for age