Enh: refactored closing entries (not completed)