Adhoc refactoring