Refactoring: Remove null paramter