namespaced re-factoring