improve section on switch cases
ws
ws