updated APK
organize imports + format code