Cleaned TimeLine class