Remove avatars, code style