Improve the dict-zip so it's not as stupid