Refactored scribe and barmaid