Adopt logging format
First step to log to file as well
Adopt logging