another round of code review updates