small refactor of age