Cleanup log output a bit more