Used 'go fmt' on files which I forgot to on my other machine.  Fixed any errors from the most recent refactoring