Fixed many small phpcs issues

This pr fixes many small phpcs issues