name space clean up a bit