Some refactoring of yaml_assistant running