Style changes

yet another bunch of style changes