some style changes keith suggested