stabilizing refactoring