code cleanup: simplified counts and disp