First batch of style changes