changed variable names to be more appropriately named