Simplify implementation

Small cleanup as discussed on another PR. @eapache