Loader: Deduplicate and clean up timeline building
Merge pull request #84 from magcius/dedup

Loader: Deduplicate and clean up timeline building