StyleCop-ed the solution