removing type from variables and changing packageIterator