fix minus index
fixed naming
erase useless loop
Merge branch 'test-2312'