Refactoring and added age