More cleaning of variables