Missed a little bit on the refactor