Minor Counter code cleanup