namespace improvement