Fixed my broken refactor from my last commit