Optimize imports, and small tasks