some style improvenment