Refactoring in respect of FxCop rules.