Improved README file and cleanup