Code refactor.

Revisited StyleCop code compliance.
Missed refactor changes.