Enhancement in java comments & code refactoring.