Refactored listing castles.