Preparing for refactoring