Fix spacing issue.
Remove unused constants from master.
Add comments.
Make WhitelistWatcher more flexible by extracting duration parameter.