refactoring : fail fast
style : formatting
Fix : Remove scope use inside a watch listener.