changed variable names and removed unnecesary vars