Refactor: Zipmap a little cleaner