Remove using namespaces from implemetation, instead wrap in namespace directly -- review comment.