Clean up white-space to be consistent; abstract duplication of radio and checkboxes