diff --git a/cli/device.py b/cli/device.py
index be5450b..94e24e6 100644
--- a/cli/device.py
+++ b/cli/device.py
@@ -43,12 +43,14 @@
                              metadata=(('get-depth', str(depth)), ))
         return res
 
-    def do_show(self, arg):
-        """Show detailed device information"""
-        print dumps(pb2dict(self.get_device(depth=-1)),
-                    indent=4, sort_keys=True)
+    do_exit = Cmd.do_quit
 
-    def do_flows(self, arg):
+    def do_show(self, line):
+        """Show detailed device information"""
+        self.poutput(dumps(pb2dict(self.get_device(depth=-1)),
+                     indent=4, sort_keys=True))
+
+    def do_flows(self, line):
         """Show flow table for device"""
         device = pb2dict(self.get_device(-1))
         print_flows(