first batch of style changes