cosmetic changes and consistent pack/unpack naming