Optimize imports and such