avatar tweak
cleanup