indexes: structural cleanup