cleaned up and removed unessary variables
cleaned up and removed unessary variables