Tidied up the connectors and jumpers