Stylecop Tweaking
Final stylecop tweaks and fixes to generated files