Further tidying. Universal Electricity should be properly installed now
:D