Fixed some refactoring typos