Updated Readme, cleanup