Removed a few regExp for faster performnce