Refactoring + notice when empty