Remove StyleCop warnings #17