Change some elements: fix from phpcs and others