Refactoring setup