Refactored Import Routine
Clean up