some stylistic tweaks