Refactor commenced for Android