clarify the codes and comments