cleanup regex again