some stylistic improvements