Minor changes for consistency
Listener now uses getSource()