Optimizing imports and headers