Refactor utilizing awesome power of Optionals.