Minor CS corrections

I ran my modified CodeSniffer over the current 3.0 branch
This is all that was found / automatically corrected.