Improve readability of wiring.