Refactor out layman calls to run_layman
Refactor out overlays to a separate method