Refactored radio group