some style improvement