Refactored the carp out of that one