Cleanup and add GetCountOffset().
Cleanup and add GetCountOffset().

jakeware/svis,jakeware/svis,jakeware/svis,jakeware/svis,jakeware/svis,jakeware/svis,jakeware/svis,jakeware/svis,jakeware/svis,jakeware/svis