Rep. Barbara Comstock's bill to reform Metro