PR for code review

Please indent the case and add curly braces { }, then add break; :bow:  (Apply to all switch-case statements)