Use tap statements to return modified objects

Apply Object#tap so it's a little easier on the eyes.. I left the awkward indentation in place :)