consolidate module imports, see #88