fix warning
refactor