Checkbox styl refactoring