Refactoring
Passing radio with separate object