Light refactor to fix JsHint waring W057 about the weird style of singletons I was using.