Merge "Swap if statement with switch"