refactored android skeleton