Fixed many small phpcs issues