Minor code review

I didn't make it very far, but I did clean up a few little issues.