fix indeed + organize import