Cleaning up and improving the TimelineControl class