repair nil error
modify style