Beautify
Reduce the logging