a lil more cleanup on timeline