While I agree, refactoring that's getting a little bit away from this pull request, I think.