Refactored Mobile Application