refactor to use package zero instead of null, and null instead of nuller