Simplify and reduce redundancy.
Merge pull request #51 from dereuromark/master-operator-spacing

Simplify and reduce redundancy.
Minor correction and cleanup.
Merge pull request #52 from dereuromark/master-cleanup

Minor correction and cleanup.
Merge branch 'master' of github.com:cakephp/cakephp-codesniffer into phpcs-fixer
More auto-corrections