minor cleanup of singleton handling