changed some static vars to members in FitDataService