Clean some code.

phpcs, with symfony2 standard, passes all code with clean results