Good refactor. A couple of adjustments is all and we can merge. There's more that we could refactor in here, but it might be a bit of a more involved project, so we'll leave it off for now.