Refactoring
Fix warning