tweak the package format a little