Refactor #import