regexp cleanup