move counts to more logical position
improve readability