beginning cleanup of regex module