Refactored with StyleCop