consolidate imports, cut more lines