PHPCS Improvements

Don't merge yet :smile: 

Depends on https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/pull/162