Fix warning
Refactor