Made modifications to the code

Did stuff to the code; removed unused methods, changed some variable
names, etc.