Refactoring $watch completed.