code review: namespace improvements