changed variable names, removed old code