Changed up switch statements to remove duplicate cases.