More code review

huzzah!