more decluttering of global namespace