a few style upgrades