small cleanup, $q is awesome.