Improve comments
Remove unused argument
Add generic event handler for registering windows to watch