Improved comments
Clean up Android local variable names