Some stylistic improvements