Java docs.
Code cleanup