Numerous style tweaks