[QAE1030] code review corrects