Some cleaning and updates to readme