refactor. rm packer