code style fix
fixed #550, fixed #557