Stylistic changes for #12.