more cleanup of comments, and android-style formatting/naming