#26 Clean and order the message for the logs. I add some new message in
order to give us more information