Fixed some code, clarified variable names, and removed unnecessary
methods