Fixed typos and incomplete refactoring