java doc, code polishing