Preparing refactoring