It's very hard to review these changes when all they are are style changes. Can you do these in separate branches from now on plz :)