extend fitness tracking
simplify statistics collection code