Fixes watchers
Formatting