Refactor of Android Manchester Android app