Cosmetic code changes to bulk_index