Refactoring by adding EMPTY