Changed formatting of log output

Also removed some debug output
Continuing experimenting with formats