StyleCop gives no more warnings

Renamed some variables, some reformating