-Cleanup: use string enum for message in yes/no dialog