Cleanup and updated README file