fix some typos add a refactoring TODO