sandbox-avatar refactoring