Linting and Typo fixes