More regex cleanup