some refactoring for odometers and commenting