Updated README.
Finally, some minor refactoring.