Misc. cleanup and code review.

Nothing much, really. Details in the commits.

Thanks for the handy website!