Some cleaning and also cleaned timeline