more cleaning, added index