first round of style changes