#468 style tweaks