#105 global namespace cleanup

Resolves #105