Refactoring avatar