refactoring, typos