Style cleanup for #1401