Cleanup and update Readme.