Spacing edits and more comments
(#426)