diff --git a/pyzebra/__init__.py b/pyzebra/__init__.py
index 006615c..6ab5e50 100644
--- a/pyzebra/__init__.py
+++ b/pyzebra/__init__.py
@@ -2,8 +2,8 @@ from pyzebra.anatric import *
 from pyzebra.ccl_io import *
 from pyzebra.ccl_process import *
 from pyzebra.h5 import *
+from pyzebra.sxtal_refgen import *
 from pyzebra.utils import *
 from pyzebra.xtal import *
-from pyzebra.sxtal_refgen import *
 
 __version__ = "0.7.2"
diff --git a/pyzebra/app/app.py b/pyzebra/app/app.py
index 295b00e..74c254f 100644
--- a/pyzebra/app/app.py
+++ b/pyzebra/app/app.py
@@ -2,19 +2,21 @@ import logging
 import sys
 from io import StringIO
 
-import pyzebra
 from bokeh.io import curdoc
 from bokeh.layouts import column, row
 from bokeh.models import Button, Panel, Tabs, TextAreaInput, TextInput
 
-import panel_ccl_integrate
-import panel_ccl_compare
-import panel_hdf_anatric
-import panel_hdf_param_study
-import panel_hdf_viewer
-import panel_param_study
-import panel_spind
-import panel_ccl_prepare
+import pyzebra
+from pyzebra.app import (
+    panel_ccl_compare,
+    panel_ccl_integrate,
+    panel_ccl_prepare,
+    panel_hdf_anatric,
+    panel_hdf_param_study,
+    panel_hdf_viewer,
+    panel_param_study,
+    panel_spind,
+)
 
 doc = curdoc()
 
diff --git a/pyzebra/app/panel_ccl_compare.py b/pyzebra/app/panel_ccl_compare.py
index a21e225..5324ca7 100644
--- a/pyzebra/app/panel_ccl_compare.py
+++ b/pyzebra/app/panel_ccl_compare.py
@@ -44,9 +44,7 @@ from bokeh.models import (
 )
 
 import pyzebra
-from pyzebra.ccl_io import EXPORT_TARGETS
-from pyzebra.ccl_process import AREA_METHODS
-
+from pyzebra import AREA_METHODS, EXPORT_TARGETS
 
 javaScript = """
 let j = 0;
diff --git a/pyzebra/app/panel_ccl_integrate.py b/pyzebra/app/panel_ccl_integrate.py
index d70ca43..7ca1fe7 100644
--- a/pyzebra/app/panel_ccl_integrate.py
+++ b/pyzebra/app/panel_ccl_integrate.py
@@ -44,9 +44,7 @@ from bokeh.models import (
 )
 
 import pyzebra
-from pyzebra.ccl_io import EXPORT_TARGETS
-from pyzebra.ccl_process import AREA_METHODS
-
+from pyzebra import AREA_METHODS, EXPORT_TARGETS
 
 javaScript = """
 let j = 0;
diff --git a/pyzebra/app/panel_hdf_anatric.py b/pyzebra/app/panel_hdf_anatric.py
index 6fac642..5717433 100644
--- a/pyzebra/app/panel_hdf_anatric.py
+++ b/pyzebra/app/panel_hdf_anatric.py
@@ -19,7 +19,7 @@ from bokeh.models import (
 )
 
 import pyzebra
-from pyzebra.anatric import DATA_FACTORY_IMPLEMENTATION, REFLECTION_PRINTER_FORMATS
+from pyzebra import DATA_FACTORY_IMPLEMENTATION, REFLECTION_PRINTER_FORMATS
 
 
 def create():
diff --git a/pyzebra/app/panel_param_study.py b/pyzebra/app/panel_param_study.py
index 4bb00f5..2cd18ea 100644
--- a/pyzebra/app/panel_param_study.py
+++ b/pyzebra/app/panel_param_study.py
@@ -52,7 +52,7 @@ from bokeh.palettes import Category10, Plasma256
 from scipy import interpolate
 
 import pyzebra
-from pyzebra.ccl_process import AREA_METHODS
+from pyzebra import AREA_METHODS
 
 javaScript = """
 let j = 0;
diff --git a/pyzebra/ccl_process.py b/pyzebra/ccl_process.py
index 1ef857b..b23a5b5 100644
--- a/pyzebra/ccl_process.py
+++ b/pyzebra/ccl_process.py
@@ -4,7 +4,7 @@ import numpy as np
 from lmfit.models import GaussianModel, LinearModel, PseudoVoigtModel, VoigtModel
 from scipy.integrate import simpson, trapezoid
 
-from .ccl_io import CCL_ANGLES
+from pyzebra import CCL_ANGLES
 
 PARAM_PRECISIONS = {
     "twotheta": 0.1,
diff --git a/pyzebra/utils.py b/pyzebra/utils.py
index 0f3408c..db09a0f 100644
--- a/pyzebra/utils.py
+++ b/pyzebra/utils.py
@@ -12,6 +12,6 @@ def find_proposal_path(proposal):
                 # found it
                 break
     else:
-        raise ValueError(f"Can not find data for proposal '{proposal}'.")
+        raise ValueError(f"Can not find data for proposal '{proposal}'")
 
     return proposal_path