code review corrections implemented