comment update & preparation of source code