Refactoring experiment