Mostly style tweaks