diff --git a/README.md b/README.md
index 328e784..b26bf2a 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ In urban areas, accuracy of less than 100 meters is possible.
 dump raw signals, without using API:
 
 ```sh
-python -m mozloc.signal
+python -m mozloc --dump
 ```
 
 ### macOS
diff --git a/src/mozloc/__main__.py b/src/mozloc/__main__.py
index 455cc07..8eacbf6 100755
--- a/src/mozloc/__main__.py
+++ b/src/mozloc/__main__.py
@@ -8,8 +8,10 @@
 """
 
 import argparse
+from pprint import pprint
 
 from .base import log_wifi_loc, process_file
+from .modules import parse_signal, get_signal
 
 
 p = argparse.ArgumentParser()
@@ -26,10 +28,13 @@
     help="Mozilla location services URL--don't use this default test key",
     default="https://location.services.mozilla.com/v1/geolocate?key=test",
 )
+p.add_argument("-d", "--dump", help="print raw data to console without logging", action="store_true")
 p.add_argument("-i", "--infile", help="use raw text saved from command line")
 args = p.parse_args()
 
-if args.infile:
+if args.dump:
+    pprint(parse_signal(get_signal()))
+elif args.infile:
     process_file(args.infile, mozilla_url=args.url)
 else:
     log_wifi_loc(cadence_sec=args.cadence, mozilla_url=args.url, logfile=args.logfile)
diff --git a/src/mozloc/signal/__init__.py b/src/mozloc/signal/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/mozloc/signal/__main__.py b/src/mozloc/signal/__main__.py
deleted file mode 100644
index cfaaa13..0000000
--- a/src/mozloc/signal/__main__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from pprint import pprint
-from ..modules import get_signal, parse_signal
-
-
-pprint(parse_signal(get_signal()))