Various minor cleanup changes made during code review, see #56.