Change readme, cleanup