Changes from phpStorm inspection