style update and time fix