Improve "import" statements