More traversal work
Cleanup of empty/default options in Package export; Reformat file with new coding style