cleaned up wiring