Address some code review feedback
Fix FxCop