Changes as response to PhPStorm Inspect Code result