Added README.md, some code cleanup