Thanks @JuneBash, that is easier to read. @libei made a PR to clean this up and we'll incorporate it in our next revision.