make spacing and escaping consistent