Clean up migration and add indicies to each essential field