Small refactor in order to try to make the spec watcher cleaner in purpose