Improve logging with a module name
Get rid of the strange trailing spaces too