Refactoring noNulls and noEmpties feature