Minor ElectricNode refactoring