Tidied up FxCop violations