#112 major refactoring of updateState in BikeModel