Style Guide: Conform to style guidelines for merge.