Use less shell escapes