refactored namespace bashing ^^