Is this diff purely code clean-up, or do you change any functionality here (other than passing in the listener)?