Completed majority of style changes