Minor refactoring
Demonstrates both ways to add listeners