PHP scrutinizer cleanup