refactored mapping for closing brances