Closed loop on structure weights/ clean up