Avatar Helpers Refactor