Maturity and style tweaks