Check
Enabled StyleCop, cleanup