Tidy up: Api Handler match checking

This changes the casing of the match function and uses the line continuation character to try and get something that is a little clearer to read.