Refactoring out the wazoo