Cleaning Up and adding ignore index