Fix stylistic transgressions