fix code by reviewed issues.