Refactor #clicked to return a ClickedButton object