Cleaning code, improved README.md