reference self.env pkg_path

vs. global; plus cleanup.