#110 global namespace cleanup