Fixed copy paste error CID18076
Fixed unused value CID18373
Fixed Logically dead code CID18084
Fix Logically dead code CID18088
Minor fixes in Main.cs
Line breaks...
Fix Tests resource leaks.
First refactor of "names etc list"
Minor fix for "Names etc list" + unit tests
Merge remote-tracking branch 'upstream/master'