Refactoring preparations