Format the logging output a little.  General cleanup