general stylistic tweaks