[Philip] Fix PedometerModel. Refactor Pedometer Rollup.