fixed Android warning
more small code cleanups, comments, and naming convention updates