- Code cleanup to ensure we pass more stringent Code analysis rules.