Some complexity refactoring.
Updated readme.