corrections accordingly to the code review input