Refactorings on Android client.