Refactor to punch

plz