Typo and refactors