Deleted index, changed names to better fit purposes of classes