Improves logging
Improves format