Moved scooping into a separate helper.

Might want to remove this comment since uh... you did.