style update and fix