Code review

Results from our code review the other day.