Sorry, meant that the second half could've been simplified (`in` is more 'pythonic' than using .find and comparing to -1).  Not a big deal obviously.