Mobile refactoring