removing redundant variables, shelling out partials/index