Refactor age_category