Code cleanup: removed some Lint warnings, fixed some annotations and
javadocs