started regex 0.2 cleanup