Refactored some nulls out and some Optionals in.