last nit: s/-/_/

otherwise looks good to me!