Add counter removal ability
Clean up comments and add block headers