PR for code review

same comment regarding switch-case statements: :bow: 
- indent case
- add curly braces
- add default