Better formatting of watcher