some style cleanup