Yep, seems like a reasonable refactor