refactor $watch expressions