Code

Replaced a couple of normalizePreg