[refactoring] Optimize imports