Make minor changes to `Tracker.Client`

Style changes/refactor.