Refactor hammy node