More refactoring to simplify things a little bit.
Updated README.