Clean-up and update of Readme