Cleanup 2 and readme