Refactoring: replaced helper for avatars with default avatar method