improved cleanup regex