refactor unnecessary lets, remove zipmap