minor refactoring. update apk