Fixed problems from StyleCop

Some problems have been cleared from hte issues that StyleCop pointed
out