Cleanup and getting it all working outside the original project.
Windows jab.  This file probably needs a from __future__ import  ...