Fix CodeSniffer issues and typos
Merge pull request #4 from asgoodasnu/Wk-639

Fix CodeSniffer issues and typos