Refactoring to use .None enum instead of nil