Cleanup and updated README.md