Formatting changes to adhere to StyleCop

Now adheres to StyleCop rules.