Removed unnecessary watchedAddresses variable.
Some code refactoring.