Minor refactoring
Working on indexPush