regex simplification wip