Minor clean up of output