Did some refactoring to satisfy StyleCop