(#157) No more StyleCop Errors :-)

- Done and done