Removing unnecessary namespace scoping