Various code and comment cleanup, see #56.