Fixed Last Commit Errors. Dimitur constant namings kept.
Code refactored by the StyleCop conventions.