-Cleanup: use string enum where possible