Removed duplicated regexp code for numbers