Tweaked use statements and docblocks
Fixed cs
Corrected type annotation
Cleanup the count function