FIX: Cleaner closing