Finished the minor refactor within the refactor