Minor code improvements.
Enhancement in java comments.
Code reviewed.