Removing uneeded variable escaping