Fix pollution of global namespace