The code that is shown in README examples will be nice cleanup, I could prepare a PR if you don't mind