More refactor for mobile