StyleCop violations fixed (#34)