extracted CellTracker from the service and refactored code everywhere