some style update
delete unneded