comments and conforming with android coding guidelines