code review corrections #1741