That should do it for the refactor