Clean code
Update all index