Fixed many small phpcs issues

This pr fixes many small phpcs issues
My question is "why do we want to break compatibility here ?". But anyway, this should be discussed elsewhere