cleaned up import code