cleaned up the import