Optionals Refactoring