Minor CS fixes as per PHPCS
Typo fixes