*More refactoring
*More boundary test cases
*Star Regex to use switch statement to escape metachars