Enhancement in java comments & refactoring.