Small clean up
Repackage