Commander TODO comment restructured.