Code review

This is a fake PR in an attempt to do a helpful code review of this.
You should also use `listenTo` here.