address review comments for Optional usage