Small logging changes + formatting