Sorry. I wasn't suggesting changing this PR if it was something from a previous commit. I do think if you want to refactor some things, that is a great one.