A spot of refactoring.
Updating README