Commit that I don't like

Interfaces to all... may have increased the probability of reuse or
create an explicit contract, but it became worse to read code.
Maybe return everything back?