Clean up logic a tad around module import