Fixed StyleCop Issues