This refactor looks good to me.