Style updates to bring in line with mono style guidelines.