General style tweaks