Refactor :golf: