[Index] - Code Refactor and cleansy