Cleanup and updated the readme.