Changes as per StyleCop

Issues shown by SyleCop