clean up code identation and styles
update apk -> v2.45