Added if statement to avatar? method and removed aliases
Retested in dev