minor stylistic improvements