Style cop settings and fixes. Part 2 + code cleaning