Fixed the README file; code cleanup