Refactoring, typos