Make comment listing more efficient