Refactoring
Silence warning