Removed testCounterSpeed and some reformatting