mobile refactor