More code review!

@staceysern and I spent some time reviewing this today, and this is what we came up with. As always, I'm open to questions and happy to make clarifications.