First round of style changes