just some namespace improvements