Refactoring NullValues