comment update and delete + code cleaning