Slight cleanup of avatar code
Hide comments that only exist to +1 an issue