code cleanup and reformat radio buttons