Adding some escaping of shell args and cleanup