small formatting & qualifying some function sw/ namespaces