refactoring
avoid warnings
refactoring