Fixed more refactor typos