cleaned up Timeline