clean up aesthetics and code for #13210