Minor refactors.

- Clean up whitespace
- Removed commented out println statements
- Removed commented out assertion
- Renamed a few methods
- Actually initialize StepCounter vector to 1000