more stylistiic tweaks