Change singleton getter to instance()