Cleanig up the regular expression usage