a bunch of style fix