Format and Typo fixes