REFACTORING: solved warnings