US5995: Refactoring, a little dab'll do ya.  Don't forget the public purge extracts.