Use tap statements to return modified objects

Just a minor tweak.. I left the awkward indentation in place :)