More stylistic cleaning