Add comment & fix some FxCop violations