Fix Regular expression and Refractor Code