Merging in style changes from previous commit