Refactored almost everything using StyleCop