Logging and printing cleanup
More printing cleanup