Optimize imports and stuff