Code cleanup
Merge branch 'Recharge_Ellensi' of https://github.com/ellensi/Dynamo into Recharge_Ellensi