no need of two checkbox
add Checkbox.checked
move class definition into sections