Refactored the last set of radio buttons