Minor improvement
Fix boolean expressions wrapping