missed a bit on refactor