Refactor and add --watch