Did a better job at really finishing the refactor!