:+1:  Also this is a nitpick but use `is None` and `is not None` instead of `== None` or `!= None`.  I'm seeing that in a few other places in this PR too so you should just do a grep for it and fix those.