Refactor Checkbox and Radio inheritance