cleaning up indexes and a little wording