Simplify control-plane readability