Some small changes and tweeks

* Made a few small changes (removed not needed counter code) and moved
privates at the very bottom.