remove obsolete checks (and it did not work...)
fix regexp patterns and range instanciate (for readability)