fix code issues
fix code issues