Refactor Optional instances