[CHANGE] add index  and code comments