Got rid of a lot of Option match statements