Java cleanups.

Remove fulfilled TODO.
Merge pull request #49 from eranmes/small-java-cleanup

Some small Java cleanups, no functional changes