Most style-level changes for #82