some style improvements