Clean up wiring (a bit)

Follow up to #129