Add code review corrections