Refactored to Clean Up User Index View