packaged cleanup and var name change