Minor refactor on index view