Refactor hangar.