Some stylistic improvements...