refactor - Changed references to "None" to use None.  Left one reference to "None" as this may break a workaround for an issue in Ghost.