clean up TimeLine class a bit...