Fixed boolean model
Refactoring