Clean up
[Fix] currend Index Setter