Yeah, that refactor would be fine, but I don't care that much either way.