Refactoring app