changed the name, removed the unnecessary self,improved regex