A ton of style fix