A number of style updates