Make singleton pattern more explicit