Removed a plethora of instance variables and added arguments to my methods