Typo and CS fixes