Clearer code.
Updated README