Cleanup and python-ing the None comparison