Code review with comments.  Mostly indents and fixing a bad merge for
stringsort