Small refactor to internalize conversion to TimeSeries