Update to bring in line with project's preferred styles.