Typo and tidy