misc generator style tweaks