Code and log messages clean up