Refactoring for mobile