changed variable names to follow accepted naming conventions