Refactoring to use Backbone events