refactored cleanup import after fixig the structure