Use more readable match syntax