Cleaned up import
Various changes