More PHPCS
JLayoutFile improvements
Base layout cleanup