Refactor and label radio buttons