Small refactoring - warning removed