Improve regex and Pattern