checkbox refactoring