Updated readme, cleanup