Refactor. Getting rid of some direct Option.get.