improved code folding of imports a bit