Watch refactor