Use namespace blocks instead of "using namespace" (#421)

Use namespace blocks instead of "using namespace" (#421) #507