Typo and style cleanup