Refactor avatar.