bug fix code refactor
bug fix code refactor