a bit of refactoring, consolidated docs in the readme