CS Fixes

Fixes some warnings when ran through cakephp codesniffer