Tweaking code style to more closely match Android standards