Cleaned up import bullshit