Fixes #85

Cleans up namespace and remaining flaws like utils::GlobalVariables