Improved numeric regex