some regex cleanup