Picking on old code

I realize this is stuff you haven't touched in 5 years, but it's my first code review for someone else and this was a short file, so I thought I'd give it a go.

* View the commit to see line-by-line comments.
* I only looked at this one file.
* If you actually care to get my opinion on the other file, I'd be happy to look it over