Use to_string when possible on Logger.log
Remove code duplication on watcher