HW2

Made a few minor changes and deleted a few unused variables