doc, polishing code, comments deleted, finalization