Optimize imports across the board