Style enhancements for #189