Good refactor. My bad