Code cleanup and comment edits, see #56.