Cleanup use of $this->namespace a little