corrections after code review