Boolean class refactor