WIP: Refactoring of Android code