publish: Various style tweaks and changes

generated from commit 7074fdec230dc7d4918a43135aeefb78b93dd764