Small changes for clean up, changed zip for key/values