Remove the not particularly useful `getCount` & `resetCount` methods
Add annotations