More stylistic adjustments