diff --git a/src/fastwq/progress.py b/src/fastwq/progress.py
index a299aa5..a564619 100644
--- a/src/fastwq/progress.py
+++ b/src/fastwq/progress.py
@@ -25,6 +25,9 @@ from PyQt4 import QtCore, QtGui
 from .lang import _
 
 
+__all__ = ['INFO_TEMPLATE', 'ProgressWindow']
+
+
 INFO_TEMPLATE = u''.join([
     _('QUERIED') + u'<br>' + 45 * u'-' + u'<br>',
     _('SUCCESS') + u' {} ' + _('WORDS') + u'<br>',
diff --git a/src/fastwq/query.py b/src/fastwq/query.py
index a07b180..9d9431d 100644
--- a/src/fastwq/query.py
+++ b/src/fastwq/query.py
@@ -19,10 +19,7 @@
 
 from collections import defaultdict
 import os
-import re
 import shutil
-import sys
-import time
 import unicodedata
 
 from aqt import mw
@@ -38,6 +35,14 @@ from .service.base import LocalService
 from .utils import Empty, MapDict, Queue, wrap_css
 
 
+__all__ = ['QueryThread', 'QueryWorkerManager', 'InvalidWordException',
+    'query_from_browser', 'query_from_editor_all_fields',
+    'query_all', 'update_note_fields', 'update_note_field',
+    'promot_choose_css', 'add_to_tmpl', 'strip_combining', 
+    'query_all_flds', 'inspect_note'
+]
+
+
 def inspect_note(note):
     """
     inspect the note, and get necessary input parameters