PR for code review

fixed all of switch cases with the correct format.