Tidied up FxCop errors