Cleanup, updated readme